merge trunk
authorKenichi Handa <handa@etlken>
Fri, 23 Jul 2010 06:50:31 +0000 (15:50 +0900)
committerKenichi Handa <handa@etlken>
Fri, 23 Jul 2010 06:50:31 +0000 (15:50 +0900)

Trivial merge